Merge "Fix doc target for multidex support library." into lmp-dev