Synced to commits: - //developers/samples/android fc1c2eac13aa87531f030f8c65d7e27c301135af - //developers/build 18730e97939c9545a26e52d135a99045c86abeaf Change-Id: I88952b8f86921739af9fed6b87d39a72af835748
Synced to developers/samples/android commit 97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910. Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
Change-Id: I71c6ff9a90b7734042d68af7f01e6d61118cc508