Merge "[conflict] Remove unused Android.mk under device/google/lynx am: eaadd11df8 am: d8dda1f2ff" into udc-qpr-dev-plus-aosp am: 54641559e3

Original change: undetermined

Change-Id: I35d16a6003588335d4f58d65f4a42eff2e7602be
Signed-off-by: Automerger Merge Worker <[email protected]>