Merge "Remove make/tools/droiddoc/test/stubs/Android.mk"
am: 2fb914c56b

Change-Id: Iae46af9305ae0d765133b30e8b63d0e1e2378be8