[automerger skipped] Remove LOCAL_ADDITIONAL_DEPENDENCIES am: 3009684b94  -s ours am: 942936d9b5  -s ours
am: d541a1775e  -s ours

Change-Id: I1dcc907ff125ac6939a73522084e9b57441e4f63