Imported Android headers aosp:android-2.2.3_r2.1

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