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

Change-Id: Ic3ed9ba73f322fc6d2d053feaf5ff11e8268ecae