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

Change-Id: Ic19e97a0c252f22587b5e1696b2b498fd656bd36