Merge "Convert merged srcjar rule to Android.bp"