Merge cherrypicks of [3661626, 3661980, 3662429, 3661545, 3661546, 3661579, 3661580, 3662430, 3661547, 3661548, 3661549, 3661550, 3662578, 3662579, 3662580, 3662581, 3662582, 3662583, 3661597, 3661598, 3661551, 3661552, 3661553, 3661554, 3661555, 3662596, 3662597, 3662598, 3662599, 3662584, 3662585, 3662586, 3662616, 3662617, 3662618] into oc-m4-release

Change-Id: I634592d507ba9fc441e7c9bb5090b7792712526d
tree: f548e640ad238d6f0a7cd3f677f08e77c5cb92e3
  1. app/
  2. doc/
  3. include/
  4. libs/
  5. tests/
  6. tools/
  7. Android.bp