diff --git a/vndk/tools/elfcheck/elfcheck/__init__.py b/vndk/tools/elfcheck/elfcheck/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/vndk/tools/elfcheck/elfcheck/android.py b/vndk/tools/elfcheck/elfcheck/android.py
new file mode 100644
index 000000000..64d3c95b2
--- /dev/null
+++ b/vndk/tools/elfcheck/elfcheck/android.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module contains utilities to extract Android build system variables."""
+
+import os.path
+
+
+def find_android_build_top(path):
+    """This function finds ANDROID_BUILD_TOP by searching parent directories of
+    `path`."""
+    path = os.path.dirname(os.path.abspath(path))
+    prev = None
+    while prev != path:
+        if os.path.exists(os.path.join(path, '.repo', 'manifest.xml')):
+            return path
+        prev = path
+        path = os.path.dirname(path)
+    raise ValueError('failed to find ANDROID_BUILD_TOP')
diff --git a/vndk/tools/elfcheck/elfcheck/readobj.py b/vndk/tools/elfcheck/elfcheck/readobj.py
new file mode 100644
index 000000000..caff970f9
--- /dev/null
+++ b/vndk/tools/elfcheck/elfcheck/readobj.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module contains utilities to read ELF files."""
+
+import re
+import subprocess
+
+
+_ELF_CLASS = re.compile(
+    '\\s*Class:\\s*(.*)$')
+_DT_NEEDED = re.compile(
+    '\\s*0x[0-9a-fA-F]+\\s+\\(NEEDED\\)\\s+Shared library: \\[(.*)\\]$')
+_DT_SONAME = re.compile(
+    '\\s*0x[0-9a-fA-F]+\\s+\\(SONAME\\)\\s+Library soname: \\[(.*)\\]$')
+
+
+def readobj(path):
+    """Read ELF bitness, DT_SONAME, and DT_NEEDED."""
+
+    # Read ELF class (32-bit / 64-bit)
+    proc = subprocess.Popen(['readelf', '-h', path], stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE)
+    stdout = proc.communicate()[0]
+    is_32bit = False
+    for line in stdout.decode('utf-8').splitlines():
+        match = _ELF_CLASS.match(line)
+        if match:
+            if match.group(1) == 'ELF32':
+                is_32bit = True
+
+    # Read DT_SONAME and DT_NEEDED
+    proc = subprocess.Popen(['readelf', '-d', path], stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE)
+    stdout = proc.communicate()[0]
+    dt_soname = None
+    dt_needed = set()
+    for line in stdout.decode('utf-8').splitlines():
+        match = _DT_NEEDED.match(line)
+        if match:
+            dt_needed.add(match.group(1))
+            continue
+        match = _DT_SONAME.match(line)
+        if match:
+            dt_soname = match.group(1)
+            continue
+
+    return is_32bit, dt_soname, dt_needed
diff --git a/vndk/tools/elfcheck/elfcheck/rewriter.py b/vndk/tools/elfcheck/elfcheck/rewriter.py
new file mode 100644
index 000000000..50d953cbf
--- /dev/null
+++ b/vndk/tools/elfcheck/elfcheck/rewriter.py
@@ -0,0 +1,280 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module implements an Android.mk rewriter which fixes errors that are
+caught by prebuilt ELF checker."""
+
+from __future__ import print_function
+
+import os.path
+import re
+import sys
+
+from .android import find_android_build_top
+from .readobj import readobj
+
+
+def _report_error(line, fmt, *args):
+    """This function prints an error message."""
+    fmt = '{}: error: ' + fmt
+    print(fmt.format(line, *args), file=sys.stderr)
+
+
+class Variable(object):
+    """This class represents the value and locations of a variable."""
+
+    def __init__(self, value, locs):
+        self.value = value
+        self.locs = list(locs)
+
+
+    def __repr__(self):
+        return repr(self.value)
+
+
+    def append(self, value, locs):
+        """Append a value to this variable."""
+        self.value += value
+        self.locs.extend(locs)
+
+
+class StashedLines(object):
+    """This class stashes lines and rewrites them before flushing them."""
+
+    _KEEP = 1
+    _DELETE = 2
+
+
+    def __init__(self):
+        self._lines = []
+
+
+    def __len__(self):
+        return len(self._lines)
+
+
+    def append(self, line):
+        """This function appends a line to stashed lines."""
+        self._lines.append((self._KEEP, line))
+
+
+    def extend(self, lines):
+        """This function appends multiple lines to stashed lines."""
+        for line in lines:
+            self.append(line)
+
+
+    def replace(self, locs, line):
+        """This function replaces `locs[0]` with `line` and marks the rest of
+        line numbers in `locs` as deleted."""
+        locs = iter(locs)
+        self._lines[next(locs)] = (self._KEEP, line)
+        for loc in locs:
+            self._lines[loc] = (self._DELETE, None)
+
+
+    def flush(self, out_file):
+        """This function prints the stashed lines to `out_file` and resets the
+        stashed lines."""
+        for action, line in self._lines:
+            if action == self._KEEP:
+                print(line, file=out_file)
+        self._lines = []
+
+
+
+class Rewriter(object):  # pylint: disable=too-few-public-methods
+    """This class rewrites the input Android.mk file and adds missing
+    LOCAL_SHARED_LIBRARIES, LOCAL_MULTILIB, or LOCAL_CHECK_ELF_FILES."""
+
+
+    _INCLUDE = re.compile('\\s*include\\s+\\$\\(([A-Za-z0-9_]*)\\)')
+    _VAR = re.compile('([A-Za-z_][A-Za-z0-9_-]*)\\s*([:+]?=)\\s*(.*)$')
+
+
+    def __init__(self, mk_path, variables=None, android_build_top=None):
+        self._mk_path = mk_path
+        self._mk_dirname = os.path.dirname(mk_path)
+
+        self._variables = {}
+        if variables:
+            for key, value in variables.items():
+                self._add_var(key, value)
+
+        if android_build_top is None:
+            self._android_build_top = find_android_build_top(mk_path)
+        else:
+            self._android_build_top = android_build_top
+
+
+    def _read_prebuilt_file_path(self):
+        file_var = self._variables.get('LOCAL_SRC_FILES')
+        if file_var is not None:
+            return os.path.join(self._mk_dirname, file_var.value)
+
+        file_var = self._variables.get('LOCAL_PREBUILT_MODULE_FILE')
+        if file_var is not None:
+            return os.path.join(self._android_build_top, file_var.value)
+
+        return None
+
+
+    @staticmethod
+    def _get_module_name_for_dt_needed(dt_needed):
+        """Convert a DT_NEEDED name to the build system module name."""
+        return re.sub('\\.so$', '', dt_needed)
+
+
+    def _get_module_names_for_dt_needed_entries(self, dt_needed_entries):
+        """Convert DT_NEEDED names into build system module names."""
+        return set(self._get_module_name_for_dt_needed(dt_needed)
+                   for dt_needed in dt_needed_entries)
+
+
+    def _rewrite_build_prebuilt(self, stashed_lines, line_no):
+        check_elf_files_var = self._variables.get('LOCAL_CHECK_ELF_FILES')
+        if check_elf_files_var is not None and \
+                check_elf_files_var.value == 'false':
+            return
+
+        # Read the prebuilt ELF file
+        prebuilt_file = self._read_prebuilt_file_path()
+        if prebuilt_file is None:
+            _report_error(line_no,
+                          'LOCAL_SRC_FILES and LOCAL_PREBUILT_MODULE_FILE are '
+                          'not defined')
+            return
+
+        if not os.path.exists(prebuilt_file):
+            _report_error(line_no, 'Prebuilt file does not exist: "{}"',
+                          prebuilt_file)
+
+        is_32bit, dt_soname, dt_needed = readobj(prebuilt_file)
+
+        # Check whether LOCAL_MULTILIB is missing for 32-bit executables
+        multilib_var = self._variables.get('LOCAL_MULTILIB')
+        if not multilib_var and is_32bit:
+            stashed_lines.append('LOCAL_MULTILIB := 32')
+
+        # Check whether DT_SONAME matches with the file name
+        filename = os.path.basename(prebuilt_file)
+        if dt_soname and dt_soname != filename:
+            stashed_lines.extend([
+                '# Bypass prebuilt ELF check due to mismatched DT_SONAME',
+                'LOCAL_CHECK_ELF_FILES := false',])
+            return
+
+        # Check LOCAL_SHARED_LIBRARIES
+        shared_libs = self._get_module_names_for_dt_needed_entries(dt_needed)
+        shared_libs_var = self._variables.get('LOCAL_SHARED_LIBRARIES')
+
+        if not shared_libs_var:
+            if shared_libs:
+                stashed_lines.append('LOCAL_SHARED_LIBRARIES := ' +
+                                     ' '.join(sorted(shared_libs)))
+            return
+
+        shared_libs_specified = set(re.split('[ \t\n]', shared_libs_var.value))
+        if shared_libs != shared_libs_specified:
+            # Replace LOCAL_SHARED_LIBRARIES
+            stashed_lines.replace(shared_libs_var.locs,
+                                  'LOCAL_SHARED_LIBRARIES := ' +
+                                  ' '.join(sorted(shared_libs)))
+
+
+    def _add_var(self, key, value, locs=tuple(), is_append=False):
+        value = self._expand_vars(value)
+
+        if is_append and key in self._variables:
+            self._variables[key].append(value, locs)
+        else:
+            self._variables[key] = Variable(value, locs)
+
+
+    def _expand_vars(self, string):
+        def _lookup_variable(match):
+            key = match.group(1)
+            try:
+                return self._variables[key].value
+            except KeyError:
+                # If we cannot find the variable, leave it as-is.
+                return match.group(0)
+
+        old_string = None
+        while old_string != string:
+            old_string = string
+            string = re.sub('\\$\\(([A-Za-z][A-Za-z0-9_-]*)\\)',
+                            _lookup_variable, old_string)
+        return string
+
+
+    def _clear_vars(self):
+        self._variables = {key: value
+                           for key, value in self._variables.items()
+                           if not key.startswith('LOCAL_')}
+
+
+    def _rewrite_lines(self, lines, out_file):
+        stashed_lines = StashedLines()
+
+        line_iter = enumerate(lines)
+        for line_no, line in line_iter:
+            match = self._INCLUDE.match(line)
+            if match:
+                command = match.group(1)
+                if command == 'CLEAR_VARS':
+                    self._clear_vars()
+                elif command == 'BUILD_PREBUILT':
+                    self._rewrite_build_prebuilt(stashed_lines, line_no)
+                stashed_lines.append(line)
+                stashed_lines.flush(out_file)
+                continue
+
+            match = self._VAR.match(line)
+            if match:
+                start = len(stashed_lines)
+                stashed_lines.append(line)
+
+                key = match.group(1).strip()
+                assign_op = match.group(2).strip()
+                value = match.group(3).strip()
+
+                while value.endswith('\\'):
+                    line_no, line = next(line_iter, (-1, None))
+                    if line is None:
+                        value = value[:-1]
+                        break
+                    stashed_lines.append(line)
+                    value = value[:-1] + line.strip()
+                end = len(stashed_lines)
+                locs = range(start, end)
+
+                self._add_var(key, value, locs, assign_op == '+=')
+                continue
+
+            stashed_lines.append(line)
+
+        stashed_lines.flush(out_file)
+
+
+    def rewrite(self, out_file=sys.stdout):
+        """This function reads the content of `self._mk_path`, rewrites build
+        rules, and prints the rewritten build rules to `out_file`."""
+
+        with open(self._mk_path, 'r') as input_file:
+            lines = input_file.read().splitlines()
+
+        self._rewrite_lines(lines, out_file)
diff --git a/vndk/tools/elfcheck/fix_android_mk_prebuilt.py b/vndk/tools/elfcheck/fix_android_mk_prebuilt.py
new file mode 100755
index 000000000..0f4a52f82
--- /dev/null
+++ b/vndk/tools/elfcheck/fix_android_mk_prebuilt.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Fix prebuilt ELF check errors.
+
+This script fixes prebuilt ELF check errors by updating LOCAL_SHARED_LIBRARIES,
+adding LOCAL_MULTILIB, or adding LOCAL_CHECK_ELF_FILES.
+"""
+
+import argparse
+
+from elfcheck.rewriter import Rewriter
+
+
+def _parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('android_mk', help='path to Android.mk')
+    parser.add_argument('--var', action='append', default=[],
+                        metavar='KEY=VALUE', help='extra makefile variables')
+    return parser.parse_args()
+
+
+def _parse_arg_var(args_var):
+    variables = {}
+    for var in args_var:
+        if '=' in var:
+            key, value = var.split('=', 1)
+            key = key.strip()
+            value = value.strip()
+            variables[key] = value
+    return variables
+
+
+def main():
+    """Main function"""
+    args = _parse_args()
+    rewriter = Rewriter(args.android_mk, _parse_arg_var(args.var))
+    rewriter.rewrite()
+
+
+if __name__ == '__main__':
+    main()