diff --git a/tools/droiddoc/templates-ndk/assets/images/android-developers-logo.png b/tools/droiddoc/templates-ndk/assets/images/android-developers-logo.png
deleted file mode 100644
index 30a8f627c..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/android-developers-logo.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/android.png b/tools/droiddoc/templates-ndk/assets/images/android.png
deleted file mode 100644
index 4040f3f76..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/android.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/android_wrench.png b/tools/droiddoc/templates-ndk/assets/images/android_wrench.png
deleted file mode 100644
index 6390a2d80..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/android_wrench.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrow-left-develop.png b/tools/droiddoc/templates-ndk/assets/images/arrow-left-develop.png
deleted file mode 100644
index 5fdfaa376..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrow-left-develop.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrow-left.png b/tools/droiddoc/templates-ndk/assets/images/arrow-left.png
deleted file mode 100644
index 43afec87f..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrow-left.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrow-right-develop.png b/tools/droiddoc/templates-ndk/assets/images/arrow-right-develop.png
deleted file mode 100644
index c86f1f35b..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrow-right-develop.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrow-right.png b/tools/droiddoc/templates-ndk/assets/images/arrow-right.png
deleted file mode 100644
index 6f7d6db65..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrow-right.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrow_bluelink_down.png b/tools/droiddoc/templates-ndk/assets/images/arrow_bluelink_down.png
deleted file mode 100755
index 58c248a28..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrow_bluelink_down.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrow_bluelink_up.png b/tools/droiddoc/templates-ndk/assets/images/arrow_bluelink_up.png
deleted file mode 100755
index 7d0f38e7e..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrow_bluelink_up.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrow_left_off.jpg b/tools/droiddoc/templates-ndk/assets/images/arrow_left_off.jpg
deleted file mode 100755
index fd32a64f1..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrow_left_off.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrow_left_on.jpg b/tools/droiddoc/templates-ndk/assets/images/arrow_left_on.jpg
deleted file mode 100755
index 143184b8c..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrow_left_on.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrow_right_off.jpg b/tools/droiddoc/templates-ndk/assets/images/arrow_right_off.jpg
deleted file mode 100755
index 17d2efee2..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrow_right_off.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrow_right_on.jpg b/tools/droiddoc/templates-ndk/assets/images/arrow_right_on.jpg
deleted file mode 100755
index baa2af12c..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrow_right_on.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/arrows-up-down.png b/tools/droiddoc/templates-ndk/assets/images/arrows-up-down.png
deleted file mode 100644
index a2a91ed0e..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/arrows-up-down.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/bg_community_leftDiv.jpg b/tools/droiddoc/templates-ndk/assets/images/bg_community_leftDiv.jpg
deleted file mode 100755
index a6d6f0e9a..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/bg_community_leftDiv.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/bg_fade.jpg b/tools/droiddoc/templates-ndk/assets/images/bg_fade.jpg
deleted file mode 100755
index c6c70b6f1..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/bg_fade.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/bg_gradient.jpg b/tools/droiddoc/templates-ndk/assets/images/bg_gradient.jpg
deleted file mode 100644
index 884f8f560..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/bg_gradient.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/bg_images_sprite.png b/tools/droiddoc/templates-ndk/assets/images/bg_images_sprite.png
deleted file mode 100755
index 84437e799..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/bg_images_sprite.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/bg_logo.png b/tools/droiddoc/templates-ndk/assets/images/bg_logo.png
deleted file mode 100755
index 7cf0cb9cb..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/bg_logo.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/blog-default.png b/tools/droiddoc/templates-ndk/assets/images/blog-default.png
deleted file mode 100644
index f8ab6c3f3..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/blog-default.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/body-gradient-tab.png b/tools/droiddoc/templates-ndk/assets/images/body-gradient-tab.png
deleted file mode 100644
index 5223ac3a2..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/body-gradient-tab.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/body-gradient.png b/tools/droiddoc/templates-ndk/assets/images/body-gradient.png
deleted file mode 100755
index 9d5985552..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/body-gradient.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/breadcrumb.png b/tools/droiddoc/templates-ndk/assets/images/breadcrumb.png
deleted file mode 100644
index 407a31811..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/breadcrumb.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/close-grey.png b/tools/droiddoc/templates-ndk/assets/images/close-grey.png
deleted file mode 100644
index 1b0d7f12b..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/close-grey.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/close-grey_2x.png b/tools/droiddoc/templates-ndk/assets/images/close-grey_2x.png
deleted file mode 100644
index 13555077e..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/close-grey_2x.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/close-white.png b/tools/droiddoc/templates-ndk/assets/images/close-white.png
deleted file mode 100644
index ef02018a8..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/close-white.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/close-white_2x.png b/tools/droiddoc/templates-ndk/assets/images/close-white_2x.png
deleted file mode 100644
index 9b9c41d19..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/close-white_2x.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/close.png b/tools/droiddoc/templates-ndk/assets/images/close.png
deleted file mode 100644
index 6ae33912d..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/close.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/dac_logo.png b/tools/droiddoc/templates-ndk/assets/images/dac_logo.png
deleted file mode 100644
index 0f110440c..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/dac_logo.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/dac_logo@2x.png b/tools/droiddoc/templates-ndk/assets/images/dac_logo@2x.png
deleted file mode 100644
index 0f2784ddb..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/dac_logo@2x.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/developers-logo.png b/tools/droiddoc/templates-ndk/assets/images/developers-logo.png
deleted file mode 100755
index 08122ee12..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/developers-logo.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/file-generic.png b/tools/droiddoc/templates-ndk/assets/images/file-generic.png
deleted file mode 100644
index 18024577b..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/file-generic.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/file-image.png b/tools/droiddoc/templates-ndk/assets/images/file-image.png
deleted file mode 100644
index d3aec4634..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/file-image.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/file-java.png b/tools/droiddoc/templates-ndk/assets/images/file-java.png
deleted file mode 100644
index ec85e4bf6..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/file-java.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/file-manifest.png b/tools/droiddoc/templates-ndk/assets/images/file-manifest.png
deleted file mode 100644
index 332d06690..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/file-manifest.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/file-xml.png b/tools/droiddoc/templates-ndk/assets/images/file-xml.png
deleted file mode 100644
index 3dd21b67b..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/file-xml.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/folder.png b/tools/droiddoc/templates-ndk/assets/images/folder.png
deleted file mode 100644
index 44c610047..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/folder.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/fullscreen.png b/tools/droiddoc/templates-ndk/assets/images/fullscreen.png
deleted file mode 100644
index 01f971cd3..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/fullscreen.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/grad-rule-qv.png b/tools/droiddoc/templates-ndk/assets/images/grad-rule-qv.png
deleted file mode 100644
index bae2d18c2..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/grad-rule-qv.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/Android_Dev_Lab_l.png b/tools/droiddoc/templates-ndk/assets/images/home/Android_Dev_Lab_l.png
deleted file mode 100644
index 3c04f2442..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/Android_Dev_Lab_l.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/GDC2011.png b/tools/droiddoc/templates-ndk/assets/images/home/GDC2011.png
deleted file mode 100644
index 82ce918b3..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/GDC2011.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/GTV_icon_large.png b/tools/droiddoc/templates-ndk/assets/images/home/GTV_icon_large.png
deleted file mode 100644
index 72d54ad7f..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/GTV_icon_large.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/GTV_icon_small.png b/tools/droiddoc/templates-ndk/assets/images/home/GTV_icon_small.png
deleted file mode 100644
index 3da169977..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/GTV_icon_small.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/IO-logo-2011.png b/tools/droiddoc/templates-ndk/assets/images/home/IO-logo-2011.png
deleted file mode 100644
index 4a28447c8..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/IO-logo-2011.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/IO-logo.png b/tools/droiddoc/templates-ndk/assets/images/home/IO-logo.png
deleted file mode 100644
index 65334c81a..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/IO-logo.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/adc2_l.png b/tools/droiddoc/templates-ndk/assets/images/home/adc2_l.png
deleted file mode 100644
index 0b101a4af..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/adc2_l.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/adc2_s.png b/tools/droiddoc/templates-ndk/assets/images/home/adc2_s.png
deleted file mode 100644
index 0d36bdb03..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/adc2_s.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/android_adc.png b/tools/droiddoc/templates-ndk/assets/images/home/android_adc.png
deleted file mode 100644
index 9fe7f8f68..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/android_adc.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/bg_home_announcement.png b/tools/droiddoc/templates-ndk/assets/images/home/bg_home_announcement.png
deleted file mode 100755
index 91485ffab..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/bg_home_announcement.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/bg_home_bottom.jpg b/tools/droiddoc/templates-ndk/assets/images/home/bg_home_bottom.jpg
deleted file mode 100755
index dacd40181..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/bg_home_bottom.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/bg_home_carousel.png b/tools/droiddoc/templates-ndk/assets/images/home/bg_home_carousel.png
deleted file mode 100755
index 5ce5e30cb..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/bg_home_carousel.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/bg_home_carousel_board.png b/tools/droiddoc/templates-ndk/assets/images/home/bg_home_carousel_board.png
deleted file mode 100755
index c577e02f2..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/bg_home_carousel_board.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/bg_home_carousel_wheel.png b/tools/droiddoc/templates-ndk/assets/images/home/bg_home_carousel_wheel.png
deleted file mode 100755
index aa224adc0..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/bg_home_carousel_wheel.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/carousel_buttons_sprite.png b/tools/droiddoc/templates-ndk/assets/images/home/carousel_buttons_sprite.png
deleted file mode 100755
index e98c94280..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/carousel_buttons_sprite.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/devphone-large.png b/tools/droiddoc/templates-ndk/assets/images/home/devphone-large.png
deleted file mode 100644
index 0db0f6cf5..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/devphone-large.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/devphone-small.png b/tools/droiddoc/templates-ndk/assets/images/home/devphone-small.png
deleted file mode 100644
index e10bfa92d..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/devphone-small.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/donut-android.png b/tools/droiddoc/templates-ndk/assets/images/home/donut-android.png
deleted file mode 100755
index 6aba06b43..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/donut-android.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/eclair-android.png b/tools/droiddoc/templates-ndk/assets/images/home/eclair-android.png
deleted file mode 100644
index d476ce965..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/eclair-android.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/froyo-android.png b/tools/droiddoc/templates-ndk/assets/images/home/froyo-android.png
deleted file mode 100644
index c63f7f02c..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/froyo-android.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/gdc-logo.png b/tools/droiddoc/templates-ndk/assets/images/home/gdc-logo.png
deleted file mode 100644
index 5fb53fb63..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/gdc-logo.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/gingerdroid.png b/tools/droiddoc/templates-ndk/assets/images/home/gingerdroid.png
deleted file mode 100644
index 8399d84d0..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/gingerdroid.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/google-plus-small.png b/tools/droiddoc/templates-ndk/assets/images/home/google-plus-small.png
deleted file mode 100644
index 5bb7d7a7d..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/google-plus-small.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/google-plus.png b/tools/droiddoc/templates-ndk/assets/images/home/google-plus.png
deleted file mode 100644
index 90871e196..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/google-plus.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/honeycomb-android.png b/tools/droiddoc/templates-ndk/assets/images/home/honeycomb-android.png
deleted file mode 100644
index 6cc50311d..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/honeycomb-android.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/icon-about.png b/tools/droiddoc/templates-ndk/assets/images/home/icon-about.png
deleted file mode 100644
index 8339762f5..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/icon-about.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/icon-design.png b/tools/droiddoc/templates-ndk/assets/images/home/icon-design.png
deleted file mode 100644
index 0d31cdf83..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/icon-design.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/icon-develop.png b/tools/droiddoc/templates-ndk/assets/images/home/icon-develop.png
deleted file mode 100644
index e02b20f4f..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/icon-develop.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/icon-distribute.png b/tools/droiddoc/templates-ndk/assets/images/home/icon-distribute.png
deleted file mode 100644
index 4824072aa..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/icon-distribute.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/ics-android.png b/tools/droiddoc/templates-ndk/assets/images/home/ics-android.png
deleted file mode 100644
index be62ca858..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/ics-android.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/io-large.png b/tools/droiddoc/templates-ndk/assets/images/home/io-large.png
deleted file mode 100755
index 986053c65..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/io-large.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/io-small.png b/tools/droiddoc/templates-ndk/assets/images/home/io-small.png
deleted file mode 100755
index 3a2254982..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/io-small.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/maps-large.png b/tools/droiddoc/templates-ndk/assets/images/home/maps-large.png
deleted file mode 100644
index b26f65a59..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/maps-large.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/maps-small.png b/tools/droiddoc/templates-ndk/assets/images/home/maps-small.png
deleted file mode 100644
index cc5f1fa02..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/maps-small.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/market-large.png b/tools/droiddoc/templates-ndk/assets/images/home/market-large.png
deleted file mode 100644
index 069fee712..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/market-large.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/market-small.png b/tools/droiddoc/templates-ndk/assets/images/home/market-small.png
deleted file mode 100644
index fa1201c43..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/market-small.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/sdk-large.png b/tools/droiddoc/templates-ndk/assets/images/home/sdk-large.png
deleted file mode 100644
index 315a1bfc8..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/sdk-large.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/home/sdk-small.png b/tools/droiddoc/templates-ndk/assets/images/home/sdk-small.png
deleted file mode 100644
index 0f1670d7f..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/home/sdk-small.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/hr_gray_main.jpg b/tools/droiddoc/templates-ndk/assets/images/hr_gray_main.jpg
deleted file mode 100755
index f7a0a2f92..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/hr_gray_main.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/hr_gray_side.jpg b/tools/droiddoc/templates-ndk/assets/images/hr_gray_side.jpg
deleted file mode 100755
index 666747669..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/hr_gray_side.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/icon_contribute.jpg b/tools/droiddoc/templates-ndk/assets/images/icon_contribute.jpg
deleted file mode 100755
index 1aa12b6a1..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/icon_contribute.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/icon_design.png b/tools/droiddoc/templates-ndk/assets/images/icon_design.png
deleted file mode 100644
index c12907c8f..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/icon_design.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/icon_download.jpg b/tools/droiddoc/templates-ndk/assets/images/icon_download.jpg
deleted file mode 100755
index f8c11658b..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/icon_download.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/icon_download2.jpg b/tools/droiddoc/templates-ndk/assets/images/icon_download2.jpg
deleted file mode 100755
index c0af7a28f..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/icon_download2.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/icon_guidelines_logo.png b/tools/droiddoc/templates-ndk/assets/images/icon_guidelines_logo.png
deleted file mode 100644
index 9362c8f52..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/icon_guidelines_logo.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/icon_market.jpg b/tools/droiddoc/templates-ndk/assets/images/icon_market.jpg
deleted file mode 100644
index 0fbb19728..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/icon_market.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/icon_play.png b/tools/droiddoc/templates-ndk/assets/images/icon_play.png
deleted file mode 100644
index 8bfdc7b64..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/icon_play.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/icon_robot.jpg b/tools/droiddoc/templates-ndk/assets/images/icon_robot.jpg
deleted file mode 100755
index ca0fd3933..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/icon_robot.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/icon_world.jpg b/tools/droiddoc/templates-ndk/assets/images/icon_world.jpg
deleted file mode 100755
index 65b8fa615..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/icon_world.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/left_off.jpg b/tools/droiddoc/templates-ndk/assets/images/left_off.jpg
deleted file mode 100755
index fd32a64f1..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/left_off.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/left_on.jpg b/tools/droiddoc/templates-ndk/assets/images/left_on.jpg
deleted file mode 100755
index 143184b8c..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/left_on.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/link-out.png b/tools/droiddoc/templates-ndk/assets/images/link-out.png
deleted file mode 100644
index aa55f9a64..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/link-out.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/locale.png b/tools/droiddoc/templates-ndk/assets/images/locale.png
deleted file mode 100644
index de3aae7ee..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/locale.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/logo_breadcrumbz.jpg b/tools/droiddoc/templates-ndk/assets/images/logo_breadcrumbz.jpg
deleted file mode 100755
index e743f860f..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/logo_breadcrumbz.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/more_check.png b/tools/droiddoc/templates-ndk/assets/images/more_check.png
deleted file mode 100644
index f2fcbfca2..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/more_check.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/open_source.png b/tools/droiddoc/templates-ndk/assets/images/open_source.png
deleted file mode 100755
index 12bb1fbe8..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/open_source.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/play-circle-grey.png b/tools/droiddoc/templates-ndk/assets/images/play-circle-grey.png
deleted file mode 100644
index 5e7e7ba69..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/play-circle-grey.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/play-circle-grey_2x.png b/tools/droiddoc/templates-ndk/assets/images/play-circle-grey_2x.png
deleted file mode 100644
index 3e01635e8..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/play-circle-grey_2x.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/play-circle-white.png b/tools/droiddoc/templates-ndk/assets/images/play-circle-white.png
deleted file mode 100644
index 017d84644..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/play-circle-white.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/play-circle-white_2x.png b/tools/droiddoc/templates-ndk/assets/images/play-circle-white_2x.png
deleted file mode 100644
index e48c1fd24..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/play-circle-white_2x.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/preliminary.png b/tools/droiddoc/templates-ndk/assets/images/preliminary.png
deleted file mode 100644
index fe0da3d20..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/preliminary.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/preview.png b/tools/droiddoc/templates-ndk/assets/images/preview.png
deleted file mode 100644
index e5856db19..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/preview.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/quicknav_arrow.png b/tools/droiddoc/templates-ndk/assets/images/quicknav_arrow.png
deleted file mode 100644
index 697ac82cd..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/quicknav_arrow.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/quicknav_btn_bg.png b/tools/droiddoc/templates-ndk/assets/images/quicknav_btn_bg.png
deleted file mode 100644
index b80c9a804..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/quicknav_btn_bg.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resizable-e.gif b/tools/droiddoc/templates-ndk/assets/images/resizable-e.gif
deleted file mode 100755
index f748097f4..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resizable-e.gif and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resizable-e2.gif b/tools/droiddoc/templates-ndk/assets/images/resizable-e2.gif
deleted file mode 100755
index e45d0c5be..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resizable-e2.gif and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resizable-eg.gif b/tools/droiddoc/templates-ndk/assets/images/resizable-eg.gif
deleted file mode 100755
index 619661626..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resizable-eg.gif and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resizable-s.gif b/tools/droiddoc/templates-ndk/assets/images/resizable-s.gif
deleted file mode 100755
index 7f6a4eb0e..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resizable-s.gif and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resizable-s2.gif b/tools/droiddoc/templates-ndk/assets/images/resizable-s2.gif
deleted file mode 100755
index 99e869c8a..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resizable-s2.gif and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resizable-s2.png b/tools/droiddoc/templates-ndk/assets/images/resizable-s2.png
deleted file mode 100644
index f3a6d2dc0..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resizable-s2.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resizable-sg.gif b/tools/droiddoc/templates-ndk/assets/images/resizable-sg.gif
deleted file mode 100755
index b4bea1014..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resizable-sg.gif and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resource-article.png b/tools/droiddoc/templates-ndk/assets/images/resource-article.png
deleted file mode 100644
index 416493f8c..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resource-article.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resource-big-article.png b/tools/droiddoc/templates-ndk/assets/images/resource-big-article.png
deleted file mode 100644
index 72732754b..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resource-big-article.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resource-big-sample.png b/tools/droiddoc/templates-ndk/assets/images/resource-big-sample.png
deleted file mode 100644
index 59b6b68bc..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resource-big-sample.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resource-big-tutorial.png b/tools/droiddoc/templates-ndk/assets/images/resource-big-tutorial.png
deleted file mode 100644
index c32e89a58..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resource-big-tutorial.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resource-big-video.png b/tools/droiddoc/templates-ndk/assets/images/resource-big-video.png
deleted file mode 100644
index 59d46a0a1..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resource-big-video.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resource-card-default-android.jpg b/tools/droiddoc/templates-ndk/assets/images/resource-card-default-android.jpg
deleted file mode 100644
index 80507444a..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resource-card-default-android.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resource-sample.png b/tools/droiddoc/templates-ndk/assets/images/resource-sample.png
deleted file mode 100644
index f7a411caf..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resource-sample.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resource-tutorial.png b/tools/droiddoc/templates-ndk/assets/images/resource-tutorial.png
deleted file mode 100644
index 10a14fec1..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resource-tutorial.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/resource-video.png b/tools/droiddoc/templates-ndk/assets/images/resource-video.png
deleted file mode 100644
index 8fd5cae4c..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/resource-video.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/right_off.jpg b/tools/droiddoc/templates-ndk/assets/images/right_off.jpg
deleted file mode 100755
index 17d2efee2..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/right_off.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/right_on.jpg b/tools/droiddoc/templates-ndk/assets/images/right_on.jpg
deleted file mode 100755
index baa2af12c..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/right_on.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/sidenav-rule.png b/tools/droiddoc/templates-ndk/assets/images/sidenav-rule.png
deleted file mode 100644
index eab992063..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/sidenav-rule.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/slide_1.jpg b/tools/droiddoc/templates-ndk/assets/images/slide_1.jpg
deleted file mode 100755
index 6d75be1df..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/slide_1.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/slide_2.jpg b/tools/droiddoc/templates-ndk/assets/images/slide_2.jpg
deleted file mode 100755
index aa994c2ef..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/slide_2.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/slide_3.jpg b/tools/droiddoc/templates-ndk/assets/images/slide_3.jpg
deleted file mode 100755
index b04deb360..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/slide_3.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/slide_large_1.jpg b/tools/droiddoc/templates-ndk/assets/images/slide_large_1.jpg
deleted file mode 100755
index a992e923d..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/slide_large_1.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/slide_large_2.jpg b/tools/droiddoc/templates-ndk/assets/images/slide_large_2.jpg
deleted file mode 100755
index 9af63f40c..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/slide_large_2.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/slide_large_3.jpg b/tools/droiddoc/templates-ndk/assets/images/slide_large_3.jpg
deleted file mode 100755
index fcf236cab..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/slide_large_3.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/slide_off.jpg b/tools/droiddoc/templates-ndk/assets/images/slide_off.jpg
deleted file mode 100755
index 597122748..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/slide_off.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/slide_on.jpg b/tools/droiddoc/templates-ndk/assets/images/slide_on.jpg
deleted file mode 100755
index 7ca35773b..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/slide_on.jpg and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/spacer.gif b/tools/droiddoc/templates-ndk/assets/images/spacer.gif
deleted file mode 100755
index f96b355f4..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/spacer.gif and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/stack-arrow-right.png b/tools/droiddoc/templates-ndk/assets/images/stack-arrow-right.png
deleted file mode 100644
index 46d6a5020..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/stack-arrow-right.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/callout.png b/tools/droiddoc/templates-ndk/assets/images/styles/callout.png
deleted file mode 100644
index 5d49f34b9..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/callout.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_land_span13.png b/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_land_span13.png
deleted file mode 100644
index bab6aca5a..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_land_span13.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_land_span8.png b/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_land_span8.png
deleted file mode 100644
index cb180bf91..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_land_span8.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_port_span5.png b/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_port_span5.png
deleted file mode 100644
index bdccc2f23..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_port_span5.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_port_span9.png b/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_port_span9.png
deleted file mode 100644
index 5e0135b22..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/device_galaxynexus_blank_port_span9.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/device_nexus4_blank_port_432.png b/tools/droiddoc/templates-ndk/assets/images/styles/device_nexus4_blank_port_432.png
deleted file mode 100644
index 9d41aa330..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/device_nexus4_blank_port_432.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/device_nexus5_blank_land_span13.png b/tools/droiddoc/templates-ndk/assets/images/styles/device_nexus5_blank_land_span13.png
deleted file mode 100644
index 5d37121e6..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/device_nexus5_blank_land_span13.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/device_nexus5_blank_port_span5.png b/tools/droiddoc/templates-ndk/assets/images/styles/device_nexus5_blank_port_span5.png
deleted file mode 100644
index df351171b..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/device_nexus5_blank_port_span5.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/device_wear_square.png b/tools/droiddoc/templates-ndk/assets/images/styles/device_wear_square.png
deleted file mode 100644
index 077a7e648..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/device_wear_square.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/device_wear_square_small.png b/tools/droiddoc/templates-ndk/assets/images/styles/device_wear_square_small.png
deleted file mode 100644
index e7e1540e2..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/device_wear_square_small.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_down.png b/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_down.png
deleted file mode 100644
index 6a0a8eea9..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_down.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_left.png b/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_left.png
deleted file mode 100644
index e887b2a6e..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_left.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_right.png b/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_right.png
deleted file mode 100644
index ced7fa48d..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_right.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_up.png b/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_up.png
deleted file mode 100644
index ddd4ec932..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/disclosure_up.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/gototop.png b/tools/droiddoc/templates-ndk/assets/images/styles/gototop.png
deleted file mode 100644
index 5f09a29fb..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/gototop.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/helpouts-logo-35.png b/tools/droiddoc/templates-ndk/assets/images/styles/helpouts-logo-35.png
deleted file mode 100644
index 3c2dc1adf..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/helpouts-logo-35.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/helpouts-logo-35_2x.png b/tools/droiddoc/templates-ndk/assets/images/styles/helpouts-logo-35_2x.png
deleted file mode 100644
index e34be2e28..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/helpouts-logo-35_2x.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/ico_action.png b/tools/droiddoc/templates-ndk/assets/images/styles/ico_action.png
deleted file mode 100644
index 30e4cc7ec..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/ico_action.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/ico_good.png b/tools/droiddoc/templates-ndk/assets/images/styles/ico_good.png
deleted file mode 100644
index afebe1c2f..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/ico_good.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/ico_movie_inline.png b/tools/droiddoc/templates-ndk/assets/images/styles/ico_movie_inline.png
deleted file mode 100644
index 7cfb5c514..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/ico_movie_inline.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/ico_phone_tablet.png b/tools/droiddoc/templates-ndk/assets/images/styles/ico_phone_tablet.png
deleted file mode 100644
index 003b8764e..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/ico_phone_tablet.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/ico_use.png b/tools/droiddoc/templates-ndk/assets/images/styles/ico_use.png
deleted file mode 100644
index 9d868b3a1..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/ico_use.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/ico_web.png b/tools/droiddoc/templates-ndk/assets/images/styles/ico_web.png
deleted file mode 100644
index 0848e3c10..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/ico_web.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/ico_wrong.png b/tools/droiddoc/templates-ndk/assets/images/styles/ico_wrong.png
deleted file mode 100644
index b7d04ce87..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/ico_wrong.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers-video.png b/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers-video.png
deleted file mode 100644
index eea34852e..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers-video.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers-video@2x.png b/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers-video@2x.png
deleted file mode 100644
index a5fdae390..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers-video@2x.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers.png b/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers.png
deleted file mode 100644
index 1fb22a2ac..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers@2x.png b/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers@2x.png
deleted file mode 100644
index bc2f74b24..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/notice-designers@2x.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers-video.png b/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers-video.png
deleted file mode 100644
index e9f8ed24e..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers-video.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers-video@2x.png b/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers-video@2x.png
deleted file mode 100644
index c067ac1ef..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers-video@2x.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers.png b/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers.png
deleted file mode 100644
index a29c31afd..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers@2x.png b/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers@2x.png
deleted file mode 100644
index d42f53790..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/notice-developers@2x.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/styles/open_new_page.png b/tools/droiddoc/templates-ndk/assets/images/styles/open_new_page.png
deleted file mode 100644
index 6197e3a86..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/styles/open_new_page.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/triangle-closed-small.png b/tools/droiddoc/templates-ndk/assets/images/triangle-closed-small.png
deleted file mode 100644
index 002364a6a..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/triangle-closed-small.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/triangle-closed.png b/tools/droiddoc/templates-ndk/assets/images/triangle-closed.png
deleted file mode 100644
index 40a68d9fc..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/triangle-closed.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/triangle-opened-small.png b/tools/droiddoc/templates-ndk/assets/images/triangle-opened-small.png
deleted file mode 100644
index e1eb784ff..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/triangle-opened-small.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/triangle-opened.png b/tools/droiddoc/templates-ndk/assets/images/triangle-opened.png
deleted file mode 100644
index 789f5fafc..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/triangle-opened.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/uiguidelines1.png b/tools/droiddoc/templates-ndk/assets/images/uiguidelines1.png
deleted file mode 100644
index 5ce1611e2..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/uiguidelines1.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/assets/images/video-droid.png b/tools/droiddoc/templates-ndk/assets/images/video-droid.png
deleted file mode 100644
index 25163b619..000000000
Binary files a/tools/droiddoc/templates-ndk/assets/images/video-droid.png and /dev/null differ
diff --git a/tools/droiddoc/templates-ndk/components/masthead.cs b/tools/droiddoc/templates-ndk/components/masthead.cs
index c09dc027f..56a0d5f07 100644
--- a/tools/droiddoc/templates-ndk/components/masthead.cs
+++ b/tools/droiddoc/templates-ndk/components/masthead.cs
@@ -4,7 +4,7 @@
 <?cs else ?>
 <a name="top"></a>
 
-<!-- dialog to prompt lang pref change when loaded from hardcoded URL 
+<!-- dialog to prompt lang pref change when loaded from hardcoded URL
 <div id="langMessage" style="display:none">
   <div>
     <div class="lang en">
@@ -67,31 +67,22 @@
         </div>
         <ul class="nav-x col-9">
             <li class="design">
-              <a href="<?cs var:toroot ?>design/index.html"
+              <a href="<?cs var:toroot ?>ndk2/index.html"
               zh-tw-lang="設計"
               zh-cn-lang="设计"
               ru-lang="Проектирование"
               ko-lang="디자인"
               ja-lang="設計"
               es-lang="Diseñar"
-              >Design</a></li>
-            <li class="develop"><a href="<?cs var:toroot ?>develop/index.html"
+              >NDK</a></li>
+            <li class="develop"><a href="<?cs var:toroot ?>ndk2/radiance/index.html"
               zh-tw-lang="開發"
               zh-cn-lang="开发"
               ru-lang="Разработка"
               ko-lang="개발"
               ja-lang="開発"
               es-lang="Desarrollar"
-              >Develop</a></li>
-            <li class="distribute last"><a href="<?cs var:toroot ?>distribute/<?cs
-              if:android.whichdoc == "offline" ?>googleplay/<?cs /if ?>index.html"
-              zh-tw-lang="發佈"
-              zh-cn-lang="分发"
-              ru-lang="Распространение"
-              ko-lang="배포"
-              ja-lang="配布"
-              es-lang="Distribuir"
-              >Distribute</a></li>
+              >Radiance</a></li>
         </ul>
 
 
@@ -123,45 +114,15 @@
             </li>
             <li class="develop">
               <ul>
-                <li><a href="<?cs var:toroot ?>training/index.html"
-                  zh-tw-lang="訓練課程"
-                  zh-cn-lang="培训"
-                  ru-lang="Курсы"
-                  ko-lang="교육"
-                  ja-lang="トレーニング"
-                  es-lang="Capacitación"
-                  >Training</a></li>
-                <li><a href="<?cs var:toroot ?>guide/index.html"
-                  zh-tw-lang="API 指南"
-                  zh-cn-lang="API 指南"
-                  ru-lang="Руководства по API"
-                  ko-lang="API 가이드"
-                  ja-lang="API ガイド"
-                  es-lang="Guías de la API"
-                  >API Guides</a></li>
-                <li><a href="<?cs var:toroot ?>reference/packages.html"
-                  zh-tw-lang="參考資源"
-                  zh-cn-lang="参考"
-                  ru-lang="Справочник"
-                  ko-lang="참조문서"
-                  ja-lang="リファレンス"
-                  es-lang="Referencia"
-                  >Reference</a></li>
-                <li><a href="<?cs var:toroot ?>sdk/index.html"
-                  zh-tw-lang="相關工具"
-                  zh-cn-lang="工具"
-                  ru-lang="Инструменты"
-                  ko-lang="도구"
-                  ja-lang="ツール"
-                  es-lang="Herramientas"
-                  >Tools</a>
+                <li><a href="<?cs var:toroot ?>ndk2/refer/index.html">
+                    Guides</a></li>
+                <li><a href="<?cs var:toroot ?>ndk2/reference/index.html">
+                    API Reference</a></li>
+                <li><a href="<?cs var:toroot ?>ndk2/samples/index.html">
+                    Samples</a></li>
+                <li><a href="<?cs var:toroot ?>ndk2/articles/index.html">
+                    Articles</a>
                 </li>
-                <li><a href="<?cs var:toroot ?>google/index.html">Google Services</a>
-                </li>
-                <?cs if:android.hasSamples ?>
-                  <li><a href="<?cs var:toroot ?>samples/index.html">Samples</a>
-                  </li>
-                <?cs /if ?>
               </ul>
             </li>
             <li class="distribute last">
@@ -201,20 +162,20 @@
 
 
 
-  <?cs elif:training || guide || reference || tools || develop || google || samples ?>
+  <?cs elif:refer || guides || ndk2 ?>
     <!-- Secondary x-nav -->
     <div id="nav-x">
         <div class="wrap" style="position:relative;z-index:1">
 
         <?cs if:reference ?>
         <?cs # HIDE HELPOUTS RECRUIT BANNER
-            <a id="helpoutsLink" class="resource resource-card resource-card-6x2x3 resource-card-6x2 helpouts-card" 
+            <a id="helpoutsLink" class="resource resource-card resource-card-6x2x3 resource-card-6x2 helpouts-card"
               href="http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=dac&utm_medium=banner&utm_campaign=android_provider_banner3" target="_blank">
               <div class="card-bg helpouts-card-bg"></div>
               <div class="card-info">
                 <div class="helpouts-description">
                   <div class="text">Help Android Wear and TV developers<br/>
-                    <span id="helpoutsLinkText" class="link-color" 
+                    <span id="helpoutsLinkText" class="link-color"
                     style="display:block;padding-top:5px;text-align:right">Learn more</span>
                   </div>
                 </div>
@@ -224,46 +185,15 @@
         <?cs /if ?>
 
             <ul class="nav-x col-9 develop" style="width:100%">
-                <li class="training"><a href="<?cs var:toroot ?>training/index.html"
-                  zh-tw-lang="訓練課程"
-                  zh-cn-lang="培训"
-                  ru-lang="Курсы"
-                  ko-lang="교육"
-                  ja-lang="トレーニング"
-                  es-lang="Capacitación"
-                  >Training</a></li>
-                <li class="guide"><a href="<?cs var:toroot ?>guide/index.html"
-                  zh-tw-lang="API 指南"
-                  zh-cn-lang="API 指南"
-                  ru-lang="Руководства по API"
-                  ko-lang="API 가이드"
-                  ja-lang="API ガイド"
-                  es-lang="Guías de la API"
-                  >API Guides</a></li>
-                <li class="reference"><a href="<?cs var:toroot ?>reference/packages.html"
-                  zh-tw-lang="參考資源"
-                  zh-cn-lang="参考"
-                  ru-lang="Справочник"
-                  ko-lang="참조문서"
-                  ja-lang="リファレンス"
-                  es-lang="Referencia"
-                  >Reference</a></li>
-                <li class="tools"><a href="<?cs var:toroot ?>sdk/index.html"
-                  zh-tw-lang="相關工具"
-                  zh-cn-lang="工具"
-                  ru-lang="Инструменты"
-                  ko-lang="도구"
-                  ja-lang="ツール"
-                  es-lang="Herramientas"
-                  >Tools</a></li>
-                <li class="google"><a href="<?cs var:toroot ?>google/index.html"
-                  >Google Services</a>
+                <li class="guides"><a href="<?cs var:toroot ?>ndk2/guides/index.html">
+                    Guides</a></li>
+                <li class="refer"><a href="<?cs var:toroot ?>ndk2/refer/index.html">
+                    API Reference</a></li>
+                <li><a href="<?cs var:toroot ?>ndk2/samples/index.html">
+                    Samples</a></li>
+                <li><a href="<?cs var:toroot ?>ndk2/articles/index.html">
+                    Articles</a>
                 </li>
-                <?cs if:android.hasSamples ?>
-                  <li class="samples"><a href="<?cs var:toroot ?>samples/index.html"
-                    >Samples</a>
-                  </li>
-                <?cs /if ?>
             </ul>
         </div>
     </div>
@@ -383,6 +313,6 @@ color:#666;font-weight:100;font-size:27px;">L Developer Preview</h1></div>
       </div>
     </div>
 
-?>    
+?>
 
 <?cs /def ?>
diff --git a/tools/droiddoc/templates-ndk/customizations.cs b/tools/droiddoc/templates-ndk/customizations.cs
index c8c88cc46..ea16501c4 100644
--- a/tools/droiddoc/templates-ndk/customizations.cs
+++ b/tools/droiddoc/templates-ndk/customizations.cs
@@ -1,14 +1,14 @@
-<?cs 
+<?cs
 def:fullpage() ?>
   <div id="body-content">
 <?cs /def ?>
-<?cs 
+<?cs
 def:sdk_nav() ?>
   <div class="wrap clearfix" id="body-content">
     <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
       <div id="devdoc-nav" class="scroll-pane">
 
-<?cs 
+<?cs
         include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
 
 
@@ -24,10 +24,10 @@ def:tools_nav() ?>
   <div class="wrap clearfix" id="body-content">
     <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
       <div id="devdoc-nav" class="scroll-pane">
-<?cs 
+<?cs
         include:"../../../../frameworks/base/docs/html/tools/tools_toc.cs" ?>
-        
-        
+
+
       </div>
     </div> <!-- end side-nav -->
     <script>
@@ -36,6 +36,44 @@ def:tools_nav() ?>
         });
     </script>
 <?cs /def ?>
+<?cs
+
+def:ndk2_guides_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs
+        include:"../../../../frameworks/base/docs/html/ndk2/guides/guides_toc.cs" ?>
+
+
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?>
+
+<?cs
+
+def:ndk2_ref_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs
+        include:"../../../../frameworks/base/docs/html/ndk2/refer/refer_toc.cs" ?>
+
+
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?>
+
 <?cs
 def:training_nav() ?>
   <div class="wrap clearfix" id="body-content">
@@ -43,9 +81,9 @@ def:training_nav() ?>
       <div id="devdoc-nav" class="scroll-pane">
 
 
-<?cs 
+<?cs
         include:"../../../../frameworks/base/docs/html/training/training_toc.cs" ?>
-        
+
 
       </div>
     </div> <!-- end side-nav -->
@@ -173,9 +211,9 @@ def:guide_nav() ?>
     <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
       <div id="devdoc-nav" class="scroll-pane">
 
-<?cs 
+<?cs
         include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
-        
+
 
       </div>
     </div> <!-- end side-nav -->
@@ -194,7 +232,7 @@ def:design_nav() ?>
 
 <?cs
         include:"../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
-       
+
 
       </div>
     </div> <!-- end side-nav -->
@@ -212,7 +250,7 @@ def:distribute_nav() ?>
 
 <?cs
         include:"../../../../frameworks/base/docs/html/distribute/distribute_toc.cs" ?>
-        
+
 
       </div>
     </div> <!-- end side-nav -->
@@ -250,12 +288,12 @@ def:google_nav() ?>
 
 <?cs
         include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
-        
+
 
       </div>
       <script type="text/javascript">
        showGoogleRefTree();
-    
+
       </script>
     </div> <!-- end side-nav -->
     <script>
@@ -273,7 +311,7 @@ def:about_nav() ?>
 
 <?cs
         include:"../../../../frameworks/base/docs/html/about/about_toc.cs" ?>
-        
+
 
       </div>
     </div> <!-- end side-nav -->
@@ -320,7 +358,7 @@ def:preview_nav() ?>
     </script>
 <?cs /def ?>
 
-<?cs # The default side navigation for the reference docs ?><?cs 
+<?cs # The default side navigation for the reference docs ?><?cs
 def:default_left_nav() ?>
 <?cs if:reference.gcm || reference.gms ?>
   <?cs call:google_nav() ?>
@@ -341,15 +379,15 @@ def:default_left_nav() ?>
         <div id="api-nav-title">Android APIs</div>
         </div><!-- end nav header -->
       <script>
-        var SINCE_DATA = [ <?cs 
-          each:since = since ?>'<?cs 
-            var:since.name ?>'<?cs 
+        var SINCE_DATA = [ <?cs
+          each:since = since ?>'<?cs
+            var:since.name ?>'<?cs
             if:!last(since) ?>, <?cs /if ?><?cs
-          /each 
+          /each
         ?> ];
         buildApiLevelSelector();
       </script>
-                  
+
       <div id="swapper">
         <div id="nav-panels">
           <div id="resize-packages-nav">
@@ -364,7 +402,7 @@ def:default_left_nav() ?>
           <div id="classes-nav" class="scroll-pane">
 
 
-<?cs 
+<?cs
             if:subcount(class.package) ?>
             <ul>
               <?cs call:list("Annotations", class.package.annotations) ?>
@@ -373,7 +411,7 @@ def:default_left_nav() ?>
               <?cs call:list("Enums", class.package.enums) ?>
               <?cs call:list("Exceptions", class.package.exceptions) ?>
               <?cs call:list("Errors", class.package.errors) ?>
-            </ul><?cs 
+            </ul><?cs
             elif:subcount(package) ?>
             <ul>
               <?cs call:class_link_list("Annotations", package.annotations) ?>
@@ -382,11 +420,11 @@ def:default_left_nav() ?>
               <?cs call:class_link_list("Enums", package.enums) ?>
               <?cs call:class_link_list("Exceptions", package.exceptions) ?>
               <?cs call:class_link_list("Errors", package.errors) ?>
-            </ul><?cs 
+            </ul><?cs
             else ?>
-              <p style="padding:10px">Select a package to view its members</p><?cs 
+              <p style="padding:10px">Select a package to view its members</p><?cs
             /if ?><br/>
-        
+
 
           </div><!-- end classes -->
         </div><!-- end nav-panels -->
@@ -427,7 +465,7 @@ def:default_left_nav() ?>
         });
     </script>
 <?cs /if ?>
-    <?cs 
+    <?cs
 /def ?>
 
 
@@ -529,25 +567,29 @@ def:header_search_widget() ?>
 
 
 
-<?cs 
+<?cs
 def:custom_left_nav() ?><?cs
   if:fullpage ?><?cs
     call:fullpage() ?><?cs
   elif:nonavpage ?><?cs
     call:no_nav() ?><?cs
-  elif:guide ?><?cs 
-    call:guide_nav() ?><?cs 
+  elif:guide ?><?cs
+    call:guide_nav() ?><?cs
   elif:design ?><?cs
-    call:design_nav() ?><?cs 
-  elif:training ?><?cs 
-    call:training_nav() ?><?cs 
-  elif:tools ?><?cs 
+    call:design_nav() ?><?cs
+  elif:training ?><?cs
+    call:training_nav() ?><?cs
+  elif:tools ?><?cs
     call:tools_nav() ?><?cs
-  elif:google ?><?cs 
-    call:google_nav() ?><?cs 
+  elif:ndk2 ?><?cs
+      call:ndk2_guides_nav() ?><?cs
+    elif:refer ?><?cs
+      call:ndk2_ref_nav() ?><?cs
+  elif:google ?><?cs
+    call:google_nav() ?><?cs
   elif:samples ?><?cs
     call:samples_nav() ?><?cs
-  elif:distribute ?><?cs 
+  elif:distribute ?><?cs
     if:googleplay ?><?cs
       call:googleplay_nav() ?><?cs
     elif:essentials ?><?cs
@@ -578,33 +620,33 @@ def:custom_left_nav() ?><?cs
   /if ?><?cs
 /def ?>
 
-<?cs # appears at the bottom of every page ?><?cs 
+<?cs # appears at the bottom of every page ?><?cs
 def:custom_cc_copyright() ?>
-  Except as noted, this content is 
+  Except as noted, this content is
   licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
-  Creative Commons Attribution 2.5</a>. For details and 
-  restrictions, see the <a href="<?cs var:toroot ?>license.html">Content 
-  License</a>.<?cs 
+  Creative Commons Attribution 2.5</a>. For details and
+  restrictions, see the <a href="<?cs var:toroot ?>license.html">Content
+  License</a>.<?cs
 /def ?>
 
-<?cs 
+<?cs
 def:custom_copyright() ?>
   Except as noted, this content is licensed under <a
-  href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>. 
+  href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
   For details and restrictions, see the <a href="<?cs var:toroot ?>license.html">
-  Content License</a>.<?cs 
+  Content License</a>.<?cs
 /def ?>
 
-<?cs 
+<?cs
 def:custom_footerlinks() ?>
   <p>
     <a href="<?cs var:toroot ?>about/index.html">About Android</a>&nbsp;&nbsp;|&nbsp;
     <a href="<?cs var:toroot ?>legal.html">Legal</a>&nbsp;&nbsp;|&nbsp;
     <a href="<?cs var:toroot ?>support.html">Support</a>
-  </p><?cs 
+  </p><?cs
 /def ?>
 
-<?cs # appears on the right side of the blue bar at the bottom off every page ?><?cs 
+<?cs # appears on the right side of the blue bar at the bottom off every page ?><?cs
 def:custom_buildinfo() ?><?cs
   if:!google && !reference.gcm && !reference.gms ?>
     Android <?cs var:sdk.version ?>&nbsp;r<?cs var:sdk.rel.id ?> &mdash; <?cs
diff --git a/tools/droiddoc/templates-ndk/docpage.cs b/tools/droiddoc/templates-ndk/docpage.cs
index 09d48c86a..76559fcaf 100644
--- a/tools/droiddoc/templates-ndk/docpage.cs
+++ b/tools/droiddoc/templates-ndk/docpage.cs
@@ -6,7 +6,7 @@
 
 <?cs
 if:(google || reference.gms || reference.gcm) ?>google<?cs /if ?><?cs
-  if:(guide||develop||training||reference||tools||sdk||samples) ?>develop<?cs
+  if:(guide||develop||training||reference||tools||sdk||samples||ndk2||guides||refer) ?>develop<?cs
     if:guide ?> guide<?cs /if ?><?cs
     if:samples ?> samples<?cs /if ?><?cs
   elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories)
@@ -195,8 +195,8 @@ include:"header.cs" ?>
 <?cs include:"trailer.cs" ?>
   <script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script>
   <script src="<?cs var:toroot ?>jd_lists_unified.js?v=8" type="text/javascript"></script>
-  <script src="<?cs var:toroot ?>jd_extras.js?v=10" type="text/javascript"></script>
-  <script src="<?cs var:toroot ?>jd_collections.js?v=10" type="text/javascript"></script>
+  <script src="<?cs var:toroot ?>jd_extras.js?v=9" type="text/javascript"></script>
+  <script src="<?cs var:toroot ?>jd_collections.js?v=9" type="text/javascript"></script>
   <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=5" type="text/javascript"></script>
 
 </body>