Merge "Don't use apexd when TARGET_FLATTEN_APEX == true" am: 68f5fb2971
am: c5f510dd13

Change-Id: Iadb863e63f6a58f338cb26db31abfe8bf7732d6e