Merge f8ee22f6ec60c27799391417b656c81e45a9a813 on remote branch

Change-Id: I963dd4f5df847609e3f0cb91f71d6c65477376c5
tree: b88dd256d539c84b3dbb94fafd8d7568e9df93d2
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS