Merge "Make some methods public for CTS"
tree: 04df3652933c4bfeb7110fa2bd34300c4bfed866
  1. Android.mk
  2. jarjar-rules.txt
  3. src/