Merge "Convert  system/timezone/output_data/android/Android.mk to Android.bp."