Fix build error am: 851ddf019d am: c952b29201
am: 68b6e1e5ca

Change-Id: I2458deaa680173f9abdda3082598f732259989ff
tree: 48dd5291ad67bdd3bcc4bc053d38d929a8b8c937
  1. build/
  2. src/
  3. tests/
  4. Android.bp
  5. MANIFEST.MF