Imported Android headers aosp:android-2.3.6_r1

Signed-off-by: Tom Swindell <t.swindell@rubyx.co.uk>