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

Change-Id: I8f69cd14c4a9639e7311e599578478c9794b6ecc