Removing differences between AOSP and internal

These commits were equivalent but not exactly the same:
AOSP commit: adb19b9b603ba83ba49b1a10b6301e396132bf3b
Internal commit: 18e74061b760389a94439f4b14acb376809a44ce

This commit makes the internal files the same as AOSP
to make future diffs easier.

Change-Id: Ie2dcdd3940244c6dd18334b58037d2e8cca93920
2 files changed