Merge "Remove deprecated Android.mk files" am: 4d0dff7238 am: 5d15e090c0 * commit '5d15e090c097bc7107512d5fbe9a4859854d5674': Remove deprecated Android.mk files Change-Id: Ia75f99ade1ba7ff04480e0050a721b8b6ff2d0fa