Merge Android R

Bug: 168057903
Merged-In: Ie7a92abe3ba5e8ed52e268bc8ee6e2464663a975
Change-Id: I37cdbd3f841cea0fd9c3ee79e43d9fedaa562329
tree: ea4eeed4c0683dc7fa4aea8d169a104a84c3ae0a
  1. Android.bp
  2. src/