intergrate more with AOSP way of building devices