developers/samples/android: f9872ded3bb6cd3c01ab0881a58764f5171b4c64 developers/build: 23e77f8a040c0b35531a68e776363f32fa7feeeb Change-Id: I93e7c66e0cff22d3852d36a1a1257bb10eec3ba0
Synced with /developers/samples/android commit 415e5ce8ad7128bed20c28e923f2f91bbfff46a9. Change-Id: I8716d051213210ec991fb692f79848a9f086a52c