Merge "Include oatdump/Android.mk"