Initial import of stock 3.1.1 tools with added Android.mk