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

Change-Id: I7c869c798b4836485daee9113b83100fc36ee862