Change-Id: Id8014b19195b8740bccf000ab66c1b599ba3a1a0
b/6606849 Change-Id: Idad46032b4b5d309db0319caeb7a1dfc0550f9f7
These have been moved from frameworks/base/build Change-Id: Ib0cdf82f4e2d61a1956baabf1fe636f46ddbc13a Signed-off-by: Dima Zavin <dima@android.com>