Support for AOSPLS builds