Merge "Convert external/smali to Android.bp"
am: 70168a3f8e

Change-Id: I95cc79c2fbfc3661d56d2b15e0d306ee42770181