1. Convert ApiDemos/Android.mk to ApiDemos/Android.bp; 2. Convert ApiDemos/tests/Android.mk to ApiDemos/tests/Android.bp Bug: 186778349 Test: compared the apk files built by Make and Soong Test: TreeHugger Change-Id: I7b72a998b56804e647d0908be5a118f9bf2cd896