Merge "Convert packages/Shell/**/Android.mk file to Android.bp" am: 355f9f77a9
am: 3d94f0ea5b

Change-Id: Iae73f1affbb285c1a2f978340a2a17ba17607265