Merge "Remove vndk/Android.mk from goldfish"