Initial prep work for AOSP

Signed-off-by: Ice974 <Disciple3603@Gmail.com>