Merge "Merge "Add AsyncTask to compiled classes" into oc-dr1-dev am: 19b979ca85 am: 45122be763" into oc-mr1-dev-plus-aosp