Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which...
authorXin Li <delphij@google.com>
Wed, 28 Dec 2016 20:43:51 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Dec 2016 20:43:51 +0000 (20:43 +0000)
commit3d11686e0e58b17ed3e96abfbc67e2b52e837b25
tree20e025cb6744fec611794a8d53dae91a261d1c46
parent6f7af0f1fd3eeed3cc5c2a78f37f43a2e7a420c0
parent77f62518ecdd9e8098f776701f534aa9802aa29c
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which was lost as a result of merge 01c922fc267ea41cc1c6cb83cde7ba6da200dc38:
am: 77f62518ec

Change-Id: I94b4ddb18d2edb47a336ef1d43ad4df00a210afb