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

Change-Id: I380f74d933b9ece95c0e9eaf3706ca0a7f63685b